Moved machine_export to its own file, added a charfield
Updated atmo-init to fix the append block code (missing a newline)
Added another name to the list
Merged
Updated tasks/machine
Merged
* Django docs recommend a tests.py file in the same directory as the
models.

https://docs.djangoproject.com/en/1.5/topics/testing/overview/
This is to make the tests discoverable to the test runner: `/manage.py
test core`.
Merge branch 'stable' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Export requests run through completion, but disks are not yet bootable. More to come soon..
Fixes post-CSS refactoring.
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere
Add instance and machine histories using core.models.

Endpoints:
/api/provider/<provider_id>/identity/<identity_id>/instance/history
/api/provider/<provider_id>/identity/<identity_id>/machine/history

Both support pagination using ?page=<num>

Core.models.instance.Instance.hash_machine_alias now has validation and
uses hash_alias if it can't find esh._node.extra['imageId'].

	modified:   api/instance.py
	modified:   api/machine.py
	modified:   api/serializers.py
	modified:   atmosphere/urls.py
	modified:   core/models/instance.py
	modified:   core/models/machine.py
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere
Exporting is now fully operational for CentOS + Eucalyptus
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Fix to machine list, exporting
Added README on imaging and exporting
README fixes (Not done)
Fixed list comprehension bug with history_machine_list.
	modified:   api/machine.py
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere