Revert 03c88de..7af1179

This rolls back to commit 03c88dedcdd9855c60251dbc88c81abeb73af063.
Revert "Revert 03c88de..7af1179"

This reverts commit 4a13a8094c0ced1c7247e602e894becef39d418c.
Revert c8014d9..d862ede

This rolls back to commit c8014d9920284ba70893774a28f179dfe99e2f87.
Modified asps
Merge branch 'master' of https://github.com/simoncomputing/Ghost